From c2cc887603d853d2010c29bb838d35a117176204 Mon Sep 17 00:00:00 2001 From: robertl Date: Fri, 8 Apr 2005 20:23:12 +0000 Subject: [PATCH] Policy change on -N - it now means "don't change fields based on other fields" instead of "no smart icons". (Specifically, don't add diff/terr to garmin and magellan protocols just becuase we happen to know them.) --- gpsbabel/garmin.c | 3 ++- gpsbabel/magproto.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c index 3dc15938f..d0e59fa77 100644 --- a/gpsbabel/garmin.c +++ b/gpsbabel/garmin.c @@ -469,7 +469,8 @@ waypoint_write(void) } way[i]->ident[sizeof(way[i]->ident)-1] = 0; - if (wpt->gc_data.diff && wpt->gc_data.terr) { + if (!global_opts.no_smart_icons && + wpt->gc_data.diff && wpt->gc_data.terr) { snprintf(obuf, sizeof(obuf), "%s%d/%d %s", get_gc_info(wpt), wpt->gc_data.diff, wpt->gc_data.terr, diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c index cd41c0752..2141314cd 100644 --- a/gpsbabel/magproto.c +++ b/gpsbabel/magproto.c @@ -1201,7 +1201,8 @@ mag_waypt_pr(const waypoint *waypointp) odesc = isrc ? isrc : ""; owpt = mag_cleanse(owpt); - if (waypointp->gc_data.diff && waypointp->gc_data.terr) { + if (!global_opts.no_smart_icons && + waypointp->gc_data.diff && waypointp->gc_data.terr) { sprintf(ofmtdesc, "%d/%d %s", waypointp->gc_data.diff, waypointp->gc_data.terr, odesc); odesc = mag_cleanse(ofmtdesc); -- 2.30.2